DATACASS-104 - completed