Merge "BUG-893: do not store classPool"