Support ST2 as well through a branch