[6.15.z] Fetch pre_upgrade data based on node properties

[6.15.z] Fetch pre_upgrade data based on node properties #15953