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