Merge remote-tracking branch 'upstream/develop' into no-term2