Merge remote-tracking branch 'upstream/trunk' into min_ost_fix