master
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2
[JAVA-29410] (#15485)
BAEL-5194 rm html tags (#11404)