374ff95 Merge branch 'feature/animated-scroll-refactor' into develop