Merge branch 'driley' into RSherman_LEX