Merge "fix(force invert): use correct bug listed for flag" into main