DATACASS-144: done; rebased all branch commits