Merge branch 'develop' into 'issue/527'

# Conflicts:
#   package/epoptes
4 jobs for issue/527 in 8 minutes and 51 seconds (queued for 8 seconds)