Ensure all changes from main are present