Merge "Add debugging to diagnose failure" into sc-dev