Merge branch '2541_save_setup_stable' into 4.7.5-stable