I201711170647
[469571] Unify doXXXSetup
22 files changed