This is the last commit for 3.0.0 unless Apple rejects. RC1 was stable but we want some stability fixes added so gonna resubmit.