Update to stay in sync. with merged PRs