[to dev/1.3] cherry pick some fixes from main branch (#158)

[to dev/1.3] cherry pick some fixes from main branch (#158) #450