Merge branch 'develop' into issue/#283-annotationlist-scrollable

4 jobs for issue/#283-annotationlist-scrollable in 3 minutes and 52 seconds (queued for 1 second)