merge instrumentation updates from fifo dev branch