Merge branch 'release/listener' into 'develop'