Merge 3.5 (fix raise)