Update APPSUPPORT-6268