Merge branch 'an/merge-single-strategy-optim'