Merge branch 'mallard-to-merge'