Merge "Hook up "instrumentation resources"" into main