Allow inputs which cause intermediate invalid states & fix labels
Merge remote-tracking branch 'issue_217' into feature-zm_all