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