Update source code for ndev-stage Aug 04, 2014