Update source code for ndev-stage Jul-16-2014