Merge "Adding additional log to track down crash" into sc-v2-dev