MR connected with issue: #473 (closed)
Corresponding test-tools merge request: test-tools!140 (merged)