Merge branch 'macos/sasl' into v1.x