#2361: Added missing estimated values bound calculation and removed duplicate code. Note that the current implementation ignores the linear scaling option.