[2107merge] Merge branch 'trac2107' into trac2107merge with fixing conflicts.
Conflict resolution is mostly straightforward adujstment for the latest interface, but it's not super trivial and should be reviewed.
This diff is collapsed.
Conflict resolution is mostly straightforward adujstment for the latest interface, but it's not super trivial and should be reviewed.