Fix #1548: initial work on sinkbinding
15 files changed