Merge "Minor change on TODO comments"