Updates from dev to deploy on ngostage (smbtc)