Fixed bug #17120: Problem with the integration of third-party trees (Thanks to Stefan...