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

Please wait for @n1k0 for a last validation :)