MOR-1630

Full details