Created attachment 161172 [details] Patch - Switch to @sample - Modernize vardir handling
Committed. Thanks