Merge "release 6.0.1 docker tag"