DPC-191 - updated interface
Merge branch 'next'