Merge "Make Instrumentation more robust to other inputs" into pi-dev