Merge "Fix name codemirror is cached under"