Update source code for ndev-stage Aug 08, 2014