update comment
use wait:true to avoid Meteor issue
Merge origin/devel-merge into devel-merge