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