Merge "Fixing race condition when infrastructure nodes acts as computes"