(cherry picked from commit 341890de) Patch was adapted to always use arg_path (i.e. $ESP), instead of two paths.