Pr/68

GetClientRec

Fixed conflicts