[dist] Unmerged changes