merged various open PRs