refs #7664. Fix warnings
Merge branch 'feature/7664_clear_ub_menu_option' into develop