13 Commits (12.0-fix-b_shift-trad)