Rerolled the patch for 9.4.x-dev
Addressed Issues from #44