The other pick type
Merge branch 'lava'