Update source code for ndev-stage Aug 15, 2014