Imported Upstream version 13.2.0