Resolve #3431173

Shelane Frenchrequested to merge
issue/views_bootstrap-3431173:3431173- into 5.5.x

Closes #3431173

Merge request reports