Update source code for ndev-stage Aug 01, 2014