added addition if condition of emsc validation based on unit testing
Merge remote-tracking branch 'origin/master'