Merge back new changes from the amblabs fork.