master
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2
[replace-last-occurrence] replace last occurrence