Sorting nested blocks
Merge branch 'fixes/nested-blocks-order'