Use out_dir for temp directory when sorting
Merge branch 'hotfix/1.2.1'