Merge branch 'release/1.17'
Changed NewCode call
Merge branch 'maintenance/v1.17' into dev