cleared 5.2.2 changes out of changes_to_master