Merge "refactor sample inspector"