Resolve #3603094 "Pdureau"

Pierre Dureaurequested to merge
issue/display_builder-3603094:3603094-pdureau into 1.0.x

Closes #3603094

Merge request reports