Incorporate changes from several pull requests