Propose TS-1912 for backport