Merge --squash with release0.3 002d6acec2 at develop