JCR-2110: Upgrade to ISPN 5.2.1.Final