Fix design time error "Unable to determine application identity of the caller"
Merge remote-tracking branch 'origin/master' into ProvideUserData