Merge remote-tracking branch 'origin/feature/4-prepare-docker-environment' into feature/4-prepare-docker-environment