CS fixes to make builds pass
Merge branch 'hotfix/4269' into develop

Forward port #4269