Merge "Quick fix for NullPointerException 211713013" into sc-v2-dev