Alternate proposal for #3509270

Lee Rowlandsrequested to merge
issue/experience_builder-3509270:3509270-rtk-magic into 0.x

Closes #3509270

Merge request reports