Merge branch 'Alan's-Branch'
Revert "Merge branch 'Alan's-Branch'"

This reverts commit be54807f1e97c560d78c23a84fffbf672b81e4f0.
Revert "Revert "Merge branch 'Alan's-Branch'""

This reverts commit 9fead8ffb8c4924583231c73924c12600464f750.