DATACMNS-495 - Forward port changelog entries from bugfix branch.