Rebase webdev/bs-3.4.x/redesign

Merge request reports