Fix #167419
Merge branch 'develop' into release/candidate