Updating for PR5289 2