Merge branch 'xdissent-close' into refactor