Merge "Prevent read of uninitialized memory" into sc-dev