Merge feature branch 'feature-ndnlp'

Change-Id: Ifc0b5cd9242ed50c96c680f2d6e0888aa12ad921