Manual merge of Pull Request 466