latest SS3.1 branch compatibility