cleanup
Merge branch 'stable' into non-stable