For clients / new-1325

new-1325