Client side implementation of the upcoming "existing record reuse" upgrade