Merge branch 'main' into feature/294-slider-issue