Merge remote-tracking branch 'origin/8.38-hotfix' into 8.38
Merge remote branch 'i15/8.38' into 8.38