Merge "Change path to daexim directory"