Add code from MR towards 1.x

Tim Dielsrequested to merge
issue/domain-3226519:3226519-navigation-block-with-active-class-2.x into 2.0.x

Closes #3226519

Merge request reports