Merge pull request #1623 from davidtwco/compiler-new-team-member-may-25

Merge pull request #1623 from davidtwco/compiler-new-team-member-may-25 #4004