Incomplete Lawyer Assignment
Merge origin/master