Merge "Add numerator check for integer divide and modulo"