Fix comment time issue
Merge branch 'slave_juw_adhoc'