Running a SQL script which has a comment after the Define connection string opens a connection di (4325737)

Calling a SQL script having a comment after the connection Define string opens a connection dialogue window. For example, running the following 3 nested SQL scripts:

C:\12345\SQL-Script.sql

define INST_PFAD='C:\12345'
@&INST_PFAD\Data\set_env_DBName.sql -- laden des Env-Files
connect &&CONN_USER;
@&INST_PFAD\Data\Dataskript.sql
commit;

that uses the following connection details:
C:\12345\Data\set_env_DBName.sql

define CONN_USER='USER/USERN@ORCL' -- Kommentar: Connectdata
define CONN_USER1='USER1/USER1@ORCL' -- Kommentar: Connectdata 

Then runs the following SQL-Script:
C:\12345\Data\Datenskript.sql
select sysdate from dual;
/

The above runs successfully in SQLPlus, however, in Toad a dialogue window opens requesting the connection data.

In Toad scripts works OK when removing the comments behind the connection defines in the file: set_env_DBName.sql.  Toad has an issue with the comments after the "define CONN_USER='USERUSER@ORCL'."

WORKAROUND: 
Write the comments before the connection Define statement.

STATUS:
Waiting for a fix to be released in a future version of Toad for Oracle.