am 3bc137eb: am 1464bd1a: am fe9da818: Fix for issue 16736964

* commit '3bc137eb1fbe037b788c13a79a0e56e4088bebe8':