Update source code for ndev-stage Aug 07, 2014