Feature/4324 prevent double encryption when relaying 2