Merge pull request #6815 from mikeller/fix_spracingf3mini_overflow