I have provided patch for 11.x, addressed #41. please review