Merge "Remove bugfix text flags." into main