Merge "[SDC-235] rebase code"