Merge "Fix "function not found" failure"