Merge branches 'gh-5', 'gh-6', 'gh-8' and 'gh-11'