I’m lazy, so this 1.7 update might take 1 or two more days. 1.6 code is on a new branch.