Merge branch 'feature/SLIDER-570-failure-text-in-funtests' into develop