Merge branch 'release/7.x-0.54.5' into develop
release 7.x-0.54.6
Merge branch 'release/7.x-0.54.6'