Merge "Refactor inspectors support code"