After-blessing for water that was covered by wine that was covered by bread

Question

If one drank wine, and then drank water or juice, and forgot to bentch for what he drank, or if he did not need to bentch for the wine because it was from Kiddush, and then he had a meal right afterwards and he recited Birkas Hamazon, would he not need to bentch for the water, since the blessing for wine covers all other drinks, only in this case the blessing for wine was covered by Birkas Hamazon?

Answer 1

According to Shulchan Aruch HaRav one would still need to make a brocha achronah on the water.