VE-1598: Round tripping working