Merge branches 'fix-ssa' and 'cmp-and-or' into next