fixed merge of pull requests, reappleid stashed changes