Resolve #3571059 "Remove layout builder dependency"

Closes #3571059

Merge request reports

Loading