[6.15.z] Ensure correct finalizer order

[6.15.z] Ensure correct finalizer order #6734