Merge change 3512

* changes:
  At least mostly-fix internal issue #1898095 / public issue #2868.