updating core: 7.26
Merge branch 'merge-cathys' into newhsl