Merge "Resolve docker build issue"