Upstream version 254~rc2