Revert "Revert "Merge branch 'Brandon'""

This reverts commit 29083af58337dcf7a2e1cf2948dbf3d1d90246e7.