Merge "fix lookup of si if customer exists"