Merge branch 'refs/heads/t/duration-keyword' into pu