Import just one layout

RH-57252 is fixed in the latest WIP