Merge pull request #7780 from keymanapp/fix/cherry-pick/7351-merge-stable-history-to-master-automatically fix: automatically merge changes to history back to master 🍒