Merge "Fix BuildInvoke"