Upstream version 247~rc2