Merge branch 'vani's_branch' into linh-dev
add assertions
fix some bugs, remv stub
Merge branch 'vani's_branch' into linh-dev