Merge branches 'upstream' and 'dev/fix'