Merge branch 'hotfix/slides-to-work'
Link directly to repo and slides.
Merge branch 'hotfix/slides_in_right_place' into develop