fix some bug
Merge branch 'merge_featureB' into tmp_merge_branch