stabalized core
Merge branch 'stable'