new version prepare
Merge remote-tracking branch 'origin/master' into SVY-6929