- backport for branch/5.0
- Backport for branch/5.0
- Fixed configure tests for correct working with new toolchain