Fix #1281 Lab Clerk can not edit existing clients
Merge branch 'release/3.1' into develop