HEMERA-3435, HEMERA-3438: Fix + radio cleanup
Merge branch 'develop' of github.com:camunda/bpmn2-modeler into develop