simplify
Merge branch 'naked'