Merge "Assert parameters are non-null" into sc-dev