Disable make test since CS4496 has no unit test
Merge branch 'origin/CS4496'