Try to pass scenario 18 to scenario 22
Merge branch 'release/v2.3.4'