Merge branch 'master' into highlight-NaN-2