Merge branch 'hotfix/listener' into develop
Fix typo composer
Merge branch 'release/1.5.3'