Merge branches 'sh/stable-updates' and 'sh/sparseirq'