Merge "partial build fix"