fix Issue 11039 - Undefined instantiation from circular imports