Merge "Make Remove() atomic, as expected" into pi-dev