Imported Upstream version 2.99.2