Merge branch 'release/5.38.0' into develop