Imported Upstream version 698.3