Merge "Validate allocations against mappings"