Merge branch 'release/7.x-0.38.4' into develop
tagging version 7.x-0.38.5
Merge branch 'release/7.x-0.38.5'