Sfr468082 backport

Merge to CCv5 maint branch