Merge branch 'ph/stash-save-m-option-fix'