Merge branch 'hotfix/1.5.6' into develop
Notification improvements
Merge branch 'release/1.5.7'