Merge branch 'GromNaN-patch-1'