Merge branch develop into 1.0