Manual-merge improvements from @fallsemo