CEMD-667

A