Resolving EMBPD00156561 for 5.0 SP2