MOR-2512

Full details