Fix silly compilation error in last fix.
Merge branch 'ncn-devel' into merge-from-standard