Merge "Instrument edit failures"