More NaN consistency fixes (manual merge of r79875 to release31-maint).
1 file changed