Update source code for ndev-stage Aug 14, 2014