Merge branch 'bugfix/account_view_source.note' into 'develop'