upstream: 05fa548a743d507924a8e62f17420f1b655419ca