I think we can merge it as is, can you please fix update the PR so it has no conflict ?