- Split the enabling patch in two for easier maintenance - Remove unused patches rendered obsolete by prior rebase
- Implement corrections requested in code review