Remember the fire-prone Galaxy Note 7? The one that Samsung discontinued after multiple cases of overheating and, in other instances, exploding and burning stuff around it? Well, it seems this phone was never erased from the market. The Korean company appears to have kept on with internal works on the handset.

The result of this is that the Galaxy Note 7 is set to receive an update to Android 8.0 Oreo, probably this Q2 2018. How did we know this? Well, the Wi-Fi Alliance has cleared multiple variants of the phone with model numbers SM-N930F, SM-N930FD, SM-N930S, SM-N930K, SM-N930X, and SM-N930L, all with Oreo on board.

Even more interesting is that the phone that temporarily replaced the Galaxy Note 7, the Galaxy Note FE, is also getting ready to receive Oreo. The FE has also received Wi-Fi Alliance certification with model numbers SM-N935S, SM-N935F, SM-N935F/DS, SM-N935L, and SM-N935K. This phone is mostly sold in Korea, but it’s also available in a few other markets as well.

It’s worth noting that the Galaxy Note 7 came preinstalled with Marshmallow and after being discontinued, it never got to Android Nougat, so it’s surprising to see it pop up as part of the latest Oreo update. On the other hand, the change of software to Nougat was one of the few tweaks the Galaxy Note FE brought in compared to the Note 7 and it was expected to receive Oreo and possibly Android P, too.

Do you still own a Galaxy Note 7? How has it been so far? And does this news excite you? Share your story in the comments section below.