liuxian-CRMS&ACMS 2nd commit