#2567 #2258 fix itests failures