Merge "Don't send data for non-main users" into main