REFS #665 - Added a backward compatibility for "--direct" option