Merge "Add debug logs to help clarify the issue" into sc-dev