Merge "Use annotation instead of comment"