Few more details
Merge branch 'release/0.5.1'