Merged changes from tag Release-0.8.0