am 827645f2: Merge "Ensure class is linked before resolution" into lmp-dev

* commit '827645f27237f3e77c87cb5e49e90389a22337a6':
  Ensure class is linked before resolution