Merge remote-tracking branch 'upstream/develop' into restrict-origin