Initial work to get 3.13 to work with SGS4