backport: pike

Closes-Bug: #1729564
Change-Id: If6db5fad1f23e0afaadcad97b4f37a13e34de9fa
(cherry picked from commit 994c80c7)