fix for note notifications
Merge branch 'master' into pinauthintegration