MOR-1642

Full details