Manual merge of #453. Closes #453