
        Merge CGClassConstructHook and CGClassNameConstructHook (fixes #8934)

561fdbb