merge branch Release 1-0