Updated the patch from #22
- Rerolled for 9.5.x
- Worked on the pending point...