Update source code for ndev-stage Jul-29, 2014