Merge "Inspector design guideline"