Resolve #3616225 "Buildable di"

Jean Valverderequested to merge
issue/display_builder-3616225:3616225-buildable-di into 1.0.x

Closes #3616225

Merge request reports