Merge "Fix compile issue"