bmsherman Merge branch 'join' into lics