BZ-12635: Fix formating issue in saving estimate
Merge branch 'Sprint73-DV' into integration