Merge "[SDC] Update SDC to 1.9.5"