Rebased with 11.x

Gauravrequested to merge
issue/drupal-3086780:3086780-improve-horizontal into 11.x

Closes #3086780

Merge request reports