update for r17072(collection refactoring)