Task 1283 implement nontermina

Merged Gradl, Tobias requested to merge task_1283-Implement_nontermina into master

Merge request reports