I hadn't realised this PR was still open. Did we agree to merge it as-is to bring our code into line with upstream, and then we can easily move forward to the newly re-written version once we have the new functionality in CAF?