Parent issue for few edge cases that have appeared after merging #22937
Parent issue for few edge cases that have appeared after merging #22937