Fixed an ANSI build error.
Merge branch 'com' into edge