Added fix for SR#EMBPD00123754

Added fix for SR#EMBPD00123754