Merge branch 'bug/JAL-1819_isNaN' into develop