Merge branch 'developer' into RSherman_LEX