ID:18299 Expanding entity and wildcard assignments.

CAUSE: Expanding entity and wildcard assignments.

ACTION: No action required.