Merge "Take 1 for the build issue on docker"