Support to run in a subdir was added