Merge in latest fixes from _s