Merge "update comment with a bug number"