Canonicalize Cross-Sells invokation Closes #2913