Imported Upstream version 5.8