Merge "Clean up some released/obsolete flags" into main