JBIDE-14366 - Full Impl & tests