add APPSUPPORT-5998