Add some comments: bugid:110318