Merge branch 'refs/heads/drewgottlieb/messaging'