Merge pull request #2934 from markscott-ms/feat/2884-pattern-version-store