Change retry policy
Change order in which columns are created
Merge branch 'master' into multiresult