Query Builder, Update Diagram incorrectly modifies the JOIN predicate (4261956)

SELECT *
FROM T1 LEFT JOIN T2 ON C1 = C2 AND C1 > 4
ORDER BY c1 

to the Generated query section and choosing 'Update Diagram' incorrectly modifies the JOIN predicate 'AND c1 > 4' to a selection predicate.
The SQL Query builder does not handle JOIN  predicates correctly.

BEFORE: 

SELECT *
FROM T1 LEFT JOIN T2 ON C1 = C2 AND C1 > 4
ORDER BY c1 


AFTER: 

SELECT *
FROM T1 INNER JOIN T2 ON (C1 = C2)
WHERE C1 > 4
ORDER BY c1

WORKAROUND:
None

STATUS:
This defect has been fixed in Toad for Oracle 12.7. The latest version can be found through this link.