Merge branch 'develop' into notifications-from-account