merge pr155 some important commits

Signed-off-by: maverick123123 <yuming.wu@dynamia.ai>

Co-authored-by: nishitnsha <nish511@gmail.com>
Signed-off-by: maverick123123 <yuming.wu@dynamia.ai>

Author: maverick123123