Merge "Handle legacy synchronous inspectors"