add comment
Merge remote-tracking branch 'origin/static-tags' into autostaging