Sync ff 0.13#17

noel2004 merged 2 commits intomainscroll-tech/zktrie:mainfrom

sync-ff-0.13scroll-tech/zktrie:sync-ff-0.13Copy head branch name to clipboard