Merge pull request #9681 from cshoredaniel/pr-msmtp-scripts-update