Merge branch 'rs/list-optim'