Merge branch 'main' into feature/878-slider-headings