Various updates.
Resolve merge commit.