[DDC-2704] merge throughout entity hierarchy