Merge remote-tracking branch 'origin/1.0-dev' into 1.0-dev
Little changes