Merged latest _s changes