I don't see the corresponding change to handle these keyword arguments in this change set. Am I missing something?