Merge "Improve QC Provider Destroy/Cleanup" into sc-v2-dev