Applied to zesty/master-next branch. As Stefan pointed out, the 'verification-done-zesty' tag has been added wrongly to the bug. I have removed the tag and added a comment about how the verification tag must be used. Thanks.