8.2
[Tests] Move expectException closer to the place of the expectation to avoid false positives
Merge branch '6.4' into 7.4
Merge branch '8.0' into 8.1
Merge branch '6.4' into 7.3