Re: #1580 fixed arrayindexoutofbounds error / styling tweak
Merge branch 'ticket-1580-rights' into develop
Merge branch 'develop' into test