Imported Upstream version 5~beta4