Update to use new Ratchet index callback mechanism
Update to use new Ratchet index callback mechanism
merge