Client integrity (10/17)

Client integrity