Merge remote-tracking branch 'Upstream/3.0' (reverse-merged from commit d69becf228c2870efd0dfa4e1a089a8670bba3f5)