propose TS-1319 for backporting (as addendum for TS-1470)