Avoiding infinite loops in the numerical decompositions when NaN values are present.
Merge remote-tracking branch 'upstream/development' into development
Merge branch 'development' into portable