Merge branch develop to 1.0