Manual merge of Alyssa's pull request