Client integrity (11/17)

Client integrity