LISP - implement changes done in VPP-376