updated changes_to_master and other changes for 5.2.1