[PATCH] More for ITS#6872