Update source code for ndev-stage Aug 06, 2014