Merge issues/docker-dev-emvironment-improvements to master