(squashed merge from the various bits and pieces already part of release-1.2, everything related to Channel & Future)