Imported Upstream version 7.36.5