v1.6.2
95c818f4 · Merge branch '162-backports' into 'v1.6-stable' ·