Merge "Remove magic number from traversal (CYCLIC_REFRESH_AQ)." into nextgenv2