I have created a patch for 11.x, please review