Merge branch 'bcm-nsp' into devel