Merge pull request #5997 from mikeller/fix_rg_ssd_f3_overflow