Merge branches 'sh/st-integration' and 'sh/stackprotector' into sh-latest