Merge topic 'li/cleanup/javassist'