Merge "Modify limits fields according to microversion"