Merge pull request #2912 from fidelity-contributions/feat/issue-2869-calm-vs-code-plugin-updates