updates for latest merged in PRs