master
BAEL-7032: updated with review comment on test
BAEL-6216 Use Mapper in Another Mapper with Mapstruct and Java (#13802)
Moving to mapstruct-2 (#16711)