Merge branch 'notify' into 'master'