Fixed PR from my prev PR #574#578

shramanb113 wants to merge 3 commits intointernetarchive:maininternetarchive/Zeno:mainfrom

shramanb113:fix/early-return-body-discard-prshramanb113/Zeno:fix/early-return-body-discard-prCopy head branch name to clipboard