Enforces element count constraint
Merges with remote master