The type of the right operand is now taken into account. (cherry picked from commit 82afe58aca)
82afe58aca