ticket number fix
Merge remote-tracking branch 'origin/v1.6.0_custom' into v1.6.0_custom