Issue 18845: Fixed issues in Insert