Merge from Shouye for the dependency build issue.