Update source code for ndev-stage Jul-21