NXP-13148: cleanup use of CoreInstance