Upstream version 2016117