Merge pull request #1270 from matrix-israel/AE/addAcoForManageModules