ec1fdfe1c3
This commit includes manual merge conflict resolution changes from a rebase by @est31.
This commit includes manual merge conflict resolution changes from a rebase by @est31.