Small fix on PrepareToRemote #2600 (#2601)
Small fix on PrepareToRemote #2600 (#2601)

* Small fix on PrepareToRemote #2600

* Address feedback

SoftWar1923/orleans,jokin/orleans,galvesribeiro/orleans,Liversage/orleans,MikeHardman/orleans,galvesribeiro/orleans,sergeybykov/orleans,pherbel/orleans,brhinescot/orleans,dotnet/orleans,sergeybykov/orleans,dVakulen/orleans,yevhen/orleans,waynemunro/orleans,Liversage/orleans,dotnet/orleans,jdom/orleans,Liversage/orleans,jthelin/orleans,ElanHasson/orleans,bstauff/orleans,jdom/orleans,jokin/orleans,amccool/orleans,dVakulen/orleans,pherbel/orleans,waynemunro/orleans,hoopsomuah/orleans,brhinescot/orleans,shlomiw/orleans,ashkan-saeedi-mazdeh/orleans,ReubenBond/orleans,gabikliot/orleans,centur/orleans,dVakulen/orleans,SoftWar1923/orleans,bstauff/orleans,ElanHasson/orleans,benjaminpetit/orleans,ibondy/orleans,centur/orleans,jokin/orleans,ashkan-saeedi-mazdeh/orleans,ibondy/orleans,ashkan-saeedi-mazdeh/orleans,amccool/orleans,brhinescot/orleans,MikeHardman/orleans,veikkoeeva/orleans,jason-bragg/orleans,gabikliot/orleans,shlomiw/orleans,amccool/orleans,yevhen/orleans,hoopsomuah/orleans