Update source code for ndev-stage Aug 05, 2014