Merge branch 'dl/branch-from-3dot-merge-base'