Merge branch '2686_master_cleanup'