Merge remote-tracking branch 'tip/x86/shstk' into HEAD