Merge "Integer to int causes null exception" into sc-dev