Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-master

Status Job ID Name Coverage
  External
passed kwrobot-branch-check