Merge "DL-next groundwork"