Updates following publication of devel-handle APIs