CDK-304: backport dataset sink