Merge "Fix ep:1610-1 build process"