add comment for shield
Merge branch 'quickfix' into development
fix a few comments