Merge "Preserve parameters to getProcAddress functions" into nyc-dev