Merge "Rearrange docker to speed-up building"