Merge "Fix wfengine docker build issue"