Merge branch 'hotfix/0.2.5.3-1' into develop
Merge branch 'release/0.2.5.4'