Merge "Fixed scenario where an authentication response has no dataset." into oc-dev