Merge "Make dx code re-entrant"