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