Merge branch 'dl/complete-rebase-and-archive'