Merged from other pull requests and other work