Sync master branch with ea-1268-staging

Get ea1268 build going so we can run a BST.