master
[BAEL-4381] Formatting
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2
Revert "BAEL-4134"