Merge branch 'fixes/docker-volumes' into devel