Merge branch 'no-term3' into no-term2