Resolve #3576178 "Layout builder usage revision fix"

Closes #3576178

Merge request reports

Loading