Bug 4923/int/correct merge of check rudder agent