Rebase glenn/live-dev branch

This branch is same as glenn/live-dev, but in a single commit.