Merge "Add additional logging to internalCleanup" into sc-dev