Merge branch 'account-notes' into 'develop'