Merge "Support unresolved methods in Optimizing"