Hi I know this thread is a few months old but I'm having the same issue, except on the Note10 (SM-970F). I want to change firmware so that I can use the dual sim functionality which Vodacom block. Did you manage to find a way how to flash the stock Samsung firmware without the "Erasing" after...