Merge branch 'GERONIMO-6683'