Merge branch 'release/0.5.1' into develop
Save order in section
Update version
Merge branch 'release/0.6.0'