Fix PR14167
Fixing PR14168
Fixing PR14169