Merge branch 'refs/heads/t/ls-incomplete-duration'