Backport backbone

Stephen Mustgraverequested to merge
issue/toolbar-3624031:3624031-port-backbone into 2.x

Closes #3624031

Merge request reports