master
Merge branch 'eugenp:master' into string_to_int_encapsulation
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2