Merge pull request #528 from 7sharp9/vnext-release

cherry pick critical issues