Merge "Fix compile warning"