Imported Upstream version 698.2