Resolve #3069861 "Layout builder support"

Julian Pustkuchenrequested to merge
3069861-layout-builder-support into 3.x

Issue #3069861 forgot to push last changes

Merge request reports