Cherrypicked the crashes and obvious fixes for 47 out of !1602 (merged) (leaving a couple commits for review)