Merged with 0.9 release