Imported Upstream version 1.48.3