Merge branch 'upstream' into max-sect