Imported Upstream version 18.0