[DO NOT REVIEW] Fixes #8375 - Not validating tag uniqueness per image