[S4-110] This change allows one to migrate existing setup to a helix setup