Merge "Fixing passing pointer to uninitialized object." into sc-dev