Update source code for ndev-stage Jul 25, 2014