XD-1378: Add options for router. Add IT test