SIO-1420 Fix redirections

Change-Id: I4ec10d1b16f22ae2c15a3eea1f9d6c4ef13d18fb