Merge remote-tracking branch 'origin/DEV/Akbar/master-slave-api-dgi-v123' into DEV/Akbar/master-slave-api-dgi-v123