I made and attached a new patch, which includes changes for comments

from Alan Third and previous patch. So, please ignore the patch file

from previous post and use this patch file.

Thanks.