Merge "Check for null shortcut before adding new split select options" into sc-v2-dev