Merge change 1079

* changes:
  Fix [Issue 1835218]