Fixed a bug introduced by renaming variables where a statement always evaluated to true and caused AD/BQ miscalculations
Merge branch 'backfill' into gb_master