update for r17072(collection refactoring)
Merge branch 'master' into issue-7697