Merge branch '226-elide'