Update source code for ndev-stage on Aug 11, 2014