Merge branch 'Version_0.11' into Version_0.12