MOR-1658

Full details