Merge pull request #15964 from pratu16x7/staging-fixes-setup-refactor

[setup][init] setup as document records