Add warning on discard
Merge branch '23-codemirror_integration' into develop