Re: #1780 - fixed
Merge branch 'ticket-1780-carousel' into develop
Merge branch 'develop' into test