BZ-7348 #resolve