Merge branch 'develop' into 'accessable-single-view'

# Conflicts:
#   CHANGELOG.md
2 jobs from accessable-single-view in 2 minutes and 27 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Test
passed #2245
test:7.2

00:01:12

passed #2246
test:7.3

00:01:15