Merge "Fix method handles using wrong section"