Merge "Fix bug reference in flag config" into main