Fix several bugs in cross-multiplication implementation#2123

leonard84 merged 2 commits intomasterspockframework/spock:masterfrom

vampire/fix-combinedspockframework/spock:vampire/fix-combinedCopy head branch name to clipboard