Fix for W-2308190

@bug W-2308190@
Merging origin/rsalvador/master-pending/W-2308190 into master