Merge "Utilities.trim never returns null." into sc-v2-dev