Merge "Fixed installation time regression when compile."