Merge branch 'hotfix/0.2.31.10'
Make retrieve all flags use smaller batch size
Merge branch 'hotfix/0.2.31.11' into develop