Upstream version 094m