version 7.x-0.54
Merge branch 'release/7.x-0.54' into develop