Move changes that require fallback-balancing client changes to this branch.
Merge branch 'fallback-balancing'