Merge "Revert from .equals to == to prevent NPE." into sc-v2-dev