Resolve #3570320 "Incompatibility in the layout_builder patch"

Closes #3570320

Merge request reports

Loading