Check cups

Maybe you should just cherrypick as there are also auto updates in the request.