CORE-4806: Label edit mode is working again