Applying patch JCR-3349/JCR-3433