Merge branch 'algorithm-order'