Merge branch 'develop' into test
Merge branch 'develop' into test
Merge branch 'develop' into test
Merge branch 'develop' into test
Merge branch 'develop' into test
Merge branch 'develop' into test
Merge branch 'develop' into test
Merge branch 'develop' into test
Merge branch 'develop' into test
Re: #1703 - fixed
Re: #1580 - fixed
Merge branch 'ticket-1580-rights' into develop