Merge "Fix build issue"