Bug fixes for tagging script and cleanup of logic for tag restrictions
Merge remote-tracking branch 'origin/testing' into testing