- Split the enabling patch in two for easier maintenance - The first patch hase been accepted upstream and will be included in next rebase - The second patch will be a local patch to be carried forward as we rebase - Remove unused patches