Imported Upstream version 698.4