Merge branch 'Bug2845'
Merge branch 'develop'
Reduce number of progress bar updates.
Merge branch 'MaskingOptimize' into develop