Merge branch 'master' into no-reformat-dialog-on-reformat-code-action