Update source for ndev-stage Jul-18