Pull request from Meng's develop branch

To match the new ACMO template (4.0.1)