Code

Merge branch 'sp/fetch-optim'