Changes to improve support for usecases when host user-id is different to docker-internal user-id (i.e. when container is spanwed from MacOS)