am fe9da818: Fix for issue 16736964

* commit 'fe9da818cde4d8be9903ad6ff42c7248ad54d822':
  Fix for issue 16736964