Drop aggregate-jar
Merge branch 'stable'