Merge "Prevent exception bugs in class linker" into lmp-dev