Merge "Replace divide with look-up"