Merge remote-tracking branch 'origin/BeforeTypeScript' into HEAD
Merge branch 'Merge'