Merge "Only run test if bugfix flag is enabled" into main