Merge branch 'hotfix-outlook-plugin'