chore(sync): merge next -> main for 0.5.1 (#206)

chore(sync): merge next -> main for 0.5.1 (#206) #151