Merge branch 'ds/for-each-file-in-obj-micro-optim'