Merge "Fix weak function lookups"