post notification fixes
Merge branch 'release-0-9-7'

# By Jared Harbour
# Via Jared Harbour
* release-0-9-7:
  post notification fixes