Fix sorting null values
Merge branch 'hotfix/0.8.2'