[#5764] Add more SCM instrumentation