Merge "Add Inspector annotations"