Move enrich_dest_objs
to separate func
#527
Merged
enrich_dest_objs
to separate func
#527