Merge remote-tracking branch 'original/master'
Merge branch 'master' into bugfix-serverAsserts