=str #15755 #15756 source and sink

sorry, deleted the old branch by accident, previous discussion was at #15786 
Will criticize once its done :)