Merge "Ensure class is linked before resolution"