fix ant build issu
Merge branch 'dev' into dev-cleanup