Merge "Include flag in build target so it is picked up by gantry" into main