Merge change from upstream: Privacy Policy for users of the application