Revert "Revert "Revert "Merge branch 'Brandon'"""

This reverts commit 389fcecf75fdc6bab05c4978df502faf4b12edd9.