Merge v1.7.x

Replacement for stale #1440