Support comment
and $comment
update
's arguments
#937
Merged
comment
and $comment
update
's arguments
#937