master
BAEL-8197 assertj soft assertions (#17043)
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2