Yes, as I said in the meeting. Basically just a "reimplemented" variant against the APIs from #631, #635 and #636.