Imported Upstream version 1.157.4