[BULLETSIM UPDATE 1] Remaining backporting completed

- This is not stable yet and is the reason it is in this branch.