Merge remote-tracking branch 'remotes/dev/1.1'