Make all TOs non-strict; for backwards compatibility.
Merge branch 'develop' into feature/issue297-wizard