Merge "Removing some instrumentation for a workarounded bug" into sc-v2-dev