Merge branch 'zh/trailer-cmd'