Merge branch 'mailer-enabled-nodeinfo' into 'develop'