[Maria-developers] merge 10.0-connect -> 10.0