Use holds form
Specify descriptor limits for cards and ACH respectively
Update client locks
Merge remote-tracking branch 'upstream/master'