Uncertain merge with 0.5's SASL