Merge "Killing the client process only if the uid matches" into main