Merge branch 'release/7.x-0.54' into develop
core version pushed to 7.31
fix make file
update version
Merge branch 'release/7.x-0.54.1'