@sanderpotjer 

Would you maybe have a chance to review this and make suggested changes before the proposed code freeze and RC on 3rd of February? If not, is there anything we can do to help update the PR?