Merge patch series "Fix shost command overloading issues"