Merge "Prevent NULL dereference g_impl not initialized"