Merge "Allow empty list of tags instead of None"