Merge Next branch for version 0.9-beta