Merge "Perform null check before updating originating tokens"