63e6a65
core/unit: merge two loops into one No functional change, just refactoring. (cherry picked from commit 4b7918a65cc2571a2b3fc166229e1b8db463e217)