There seem to be some implementation in the 2.5 snapshot. Did you look into that? Or is this something else?