Fixes issue with legacy data and authentication, should be a hotfix