Merge "Add ability to skip function name resolution."