RE #1709 Fix for Corelib re-organization