[ripcord/f30] (2 commits) ...Properly import sprm