Merge branch 'developer' into RSherman_LEX

Includes Dylan and Pitman code