change: Update to v21.0.3
Merge branch 'master' into demo-build
change: Fix ant compile issue