Update instrumentation
Merge master branch into bridging. Fix merge conflicts.