There are currently some conflicts that prevents a merge of this PR. I am also not sure whats the status of this extension is, if there are still necessary changes. As the 6.0 release is scheduled for middle of next week, maybe you can give an update if this is ready or need more time.