Merge branch 'max-sect' into upstream