Merge "Move verification of response attributes into service client"