Add a link to the related issue 2227