[#31598] Fix for B/C break related to Tag saving using *old* way (Fix #1606)