Merge into 1.6-bugfixes