DDF-928: removed dependency on wrapper script