don't try to format NaN
@bug W-1780745@
Merging origin/jay/master-pending-masternanfix into master