FT-1588 new mergeFrom() code to avoid unresolved lazy loaded proxies problem