master
BAEL-6216 Use Mapper in Another Mapper with Mapstruct and Java (#13802)
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2