Merge branch 'release-v2.1.5' into develop
Don't delete the previous index inside create_and_deploy_index
Increase page size limit to 500
Version 2.1.6
Merge branch 'release-v2.1.6'