Merge from release-1.0beta to Z2