am 9db18e16: Merge "Reduce and speed-up class def searches." into lmp-dev

* commit '9db18e1679800bc57c1e30f7c5ff786949ffe5cf':
  Reduce and speed-up class def searches.