Merge "Comment updated for privacy clarity" into pi-dev