Fix String equality

Issue: SPR-12105