EN-2267: in progress