Draft: Resolve #3516432 "Unbreak head"

Wim Leersrequested to merge
issue/experience_builder-3516432:3516432-unbreak-head into 0.x

Closes #3516432

Merge request reports