Add andy's temporary notification workaround
Merge branch 'dev-branch'