Merge PRs 120, 121, 122