Merge branch 'abort-close' into merge