This change (1/2) will be merged to the CCS v2.3 release.

Abner