rolled version forward to bring in s1ws patch