refs #8591. Move helper and apply warning fix.
Merge remote branch 'origin/feature/8591_helper_and_fixes'