Merging 823a5fd to release
Merge branch 'release-158-wall-notify-fix' into release-158