am 1464bd1a: am fe9da818: Fix for issue 16736964

* commit '1464bd1a597f945e00b7342852728aab78dfdf95':