Connected to https://gitlab.cern.ch/web-team/drupal/public/d8/themes/cern/issues/34 and cern!54 (merged)