[merge] merge trunk-minimal-bin-chs branch