Thanks to Tim for the review.
The issue was fixed on master in e9103402c0 so this just forwardports the test and release notes from stable/1.7.x. Forwardport of 2d12a59938 from stable/1.7.x
e9103402c0
2d12a59938