Merge "Change flags to bugfix flags" into main