Forwardport of test and release note from stable/1.7.x Backport of ae87ad005f from master
ae87ad005f
Backport of ea9157f681 from master
ea9157f681