Merge remote-tracking branch 'origin/jhargrave' into RSherman_LEX

Pre-demo merge