Merge "Fix SI address and initialistion bugs"