Merge branch 'jolly/mncc'

Merge the interface changes to the MNCC protocol