Cherry-pick PRs to the 4.1.x release#1232

shaobo-he-aws wants to merge 17 commits into

shaobo/release-4.1.x-cherry-pickcedar-policy/cedar:shaobo/release-4.1.x-cherry-pickfrom

shaobo/release-4.1.x-stagingcedar-policy/cedar:shaobo/release-4.1.x-stagingCopy head branch name to clipboard