Merge "Add extra connection check on testAutoFillOneDatasetAndSave()" into oc-dev