Merge branch 'ti/fetch-everything-local-optim'