Fix #1654: enable sinkbinding automatically
6 files changed