Imported Upstream version 698.5