Bypass GROOVY-6951