Merge changes for Docker packaging