The issue was fixed on master in e9103402
so this just forwardports the test and release notes from stable/1.7.x.

Forwardport of 2d12a599 from stable/1.7.x