Merge branch 'release/7.x-0.54.7' into develop
update tags
Merge branch 'release/7.x-0.54.8'