Merge branch 'ht-delete-2.6.35' into release