Upstream version 190423