EA-60422 - AIOOBE: ClassReader.readShort
EA-58510 Registering post-startup activity that will never be run
(cherry picked from commit d57d659)