Merge "Fix docker build"