SM 4.10 and fixes