Merge tag 'v0.6.0'

machine & group
...