Merge "Reduce and speed-up class def searches." into lmp-dev