9629790b1b
This is based on the work of Shamim Rezaie and will also resolve MDL-52375 and MDL-50378
This is based on the work of Shamim Rezaie and will also resolve MDL-52375 and MDL-50378