Re #7921 change button functionality
Merge remote branch 'origin/feature/7921_refl_save_button'