Update source code for ndev-stage Aug 18, 2014