[SDC-29] rebase continue work to align source