Refs #9665 Swap to using scale_container var so we can delete it.
Merge branch 'bugfix/9665_apply_corr_scaling_bug' into develop