Merging commits from Happy/Alex/Will.