MLHR-685 #resolve
Merge pull request #665 from andyperlitch/cpu_nan.MLHR-685

MLHR-685 #resolve