Re #7921 change button functionality
Merge branch 'feature/7921_refl_save_button' into develop