Merge "Optimize method linking"