Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0