sortinit+sortinithash
Merge branch 'dev' into ms