Refs #7806 one less for edge
Merge branch 'feature/7806_quad_bkg' into develop