Upstream version 248