branch-hotfix-4569-r4584