Merge branch 'release/1.18'
Changed NewCode call
Merge branch 'V1.18_fix' into dev