Merge back changes from hach-que:master