master
https://jira.baeldung.com/browse/BAEL-7876
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2