Applying Plone Hotfix (refs #14723)