ISPN-800 cleaned up manifest imports of internal packages
ISPN-3850 corrected repeated calls to WeakReference#get