more support of DAK 4707630 upgrade

eaa4631ba05f8004ffe82fa35683c42e5044a096