Various updates (squashed to remove unresolved merge conflicts in the commit history)