Update source code for ndev-stage Aug 19, 2014