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