Merge "lib.sh: Fix locals override in nested invocations" into stable/euphrates