Merge "Ensure class is linked before resolution" into lmp-dev