Cherry pick 'azure debug reindex' into release/0.7

This brings !126 (merged) into the release branch to fix the azure tests