Merge branch 'vs-rc-defines' into release