Ajay/DC | #3622 | Updated error message
Merge branch 'develop' into merged-dcs