fix stk1160
backport stk1160 from 3.16