Update source code for ndev-stage Aug 12, 2014