Merge before release 0.6.8