[Cherry-Pick] Apply changes from #165 #175

Closed peb-adr closed 3 days ago