Wip 15755 15756 source sink patriknw

sorry, deleted the old branch by accident, previous discussion was at #15786