Merge "Clean up outdated back flags" into main